Couple of front end tweaks