Updated application and css to improve layout