fixed some layouting issues