more elements and some layout cleaning