some layouting bugfixes