fixed Margins and improved Views