Added panels and improved view