Solved minor bags and some changed UI