changed UI and fixed small bugs