New layout

all the forms that should be there, I just need to add colours