Layout

simplifying layout for readability