final front-end changes