More mobile optomizations to make it a little prettier
fixing some merge conflicts