Styling layout and fixing bugs