refactoring

btw, the layout is also inside a ScrollView since the last commit