some changes to the frontend, about to merge them
working on frontend