layouts, fixes, etc. (final version i suppose)