FIX: Layout now has labels instead of hints, and button