some changes on the front end
some changes on the front end