Finishing UI improvements