Reworking view functionality & order..