fixed several layouting issues