Added some ux tweaks