UI changes and home redirect issue