Finished tweaking layout and styling