Minor UI improvements
More flexible CSS