Updated more UI design issues