Updated view logic and background whitespace issue