Skinned nav and login form
Conflict resolution