Cleanup, front end tweaks