Fixes and multiple floor sizes.

TODO:
	-> test on bigger screens.
	-> merge correctly with flavio`s branch.