Made some structure changes in front-end side.