Made changes to the design

Need to fix most of the forms now though