Finished up front-end MVP