improving some layout things