Fix some UI design issues