Added login redirect and fixed layout