Reorganizing views, adding more whitespace