Layout fixes; login fixes