Improving layout and refining classes/id's