Added a lot of front-end stuff