Merging the branch of the new UI design to master. Not all functionalities are fully implemented yet.