Updating css and layout UI, WIP