Sixth Commit

Improve front
Seventh Commit

Improve the front.