FIX: layout little fixes