main || right

Updates

- new layout