Finished up front-end and separated out js