Fix some layout issues in the main app
Refactor the texts in the main page