Better simple layout
guest:guest added
Fixes and improvements