Few bugfixes and layout revisions