Finished Front End sans bug fixes