Finished front end changes