added fields and changed to float layout
Finished layout