Fix the view composer
Re-design the layout