Changed main layout to match new specs