[Added] fixes for authorization and layout issues.