UI design tweaked