Finished ui ux touches