Frontend cleanup and purty up