More updates to the layout, looks much better and refined