again, hopefully improving some layout issues