UI improvemetns for mobile