CLINPORTAL-6990 & CLINPORTAL-7000 and other minor UI Fixes