commit

recommit
overall layout

finish it this monday!