Fixed some front end and tweaked display