Resolve merge conflict
Multiple columns for amenities list
Add spacing between checkbox and input label