fix layouting issues