merge mobile branch with responsive features