further layout fixing, repair of longterm and small bugs