Tidying up front end. Added 3 extra functionality