started making the layout correct which is messed up