various changes specifically front-end layout