Improved Frontend

Need to add more action listeners