am: f3a65fd * commit 'f3a65fd31798f8c7ecfa0f3db292d115c10c3dbc': Minor UI improvements and code cleanup:
f3a65fd