bunch of layout nonsense
added some stuff for users