Changed layout to a more spacious one