fixed some layout issues and applied some of the suggested automatic updates