new layout updates. got the main stuff done