Fixed some layout issues and image issues