Fixed some layouting issues