Fixed some layout issues
Updated login redirect flow