Fixing admin layout logic, blinking in angular