Full layout revamp all forms