[FIX] layouting issues