final(?) fixes for new layout