Fixed CSS problems, updated layout