Bottom-bar and layout fixes