New layout and fixes

MAJOR FIXES AND REDESIGNING OF SOME ELEMENTS