Slight changes to front-end for aesthetics