Develop

This pull request improves the whole layout thanks to the used HPI App.