some layout fixes and more ;-)