bugfixes, layout, presentation