mobile ready and refactoring