Mobile UI Fixups assigned by sir amer