Added almost all functionalities, some UI changes