fix layout
adjust layout
Merge frontend and backend.
Merge pull request #3 from yazfaz/frontend

Frontend