Merge "Refactor and simplify layouts and css styles"