Improvements + jqm fix