Minor changes to accomodate mobile