Cleanup
Rework layout