test bugfix + layout improvements