Production commit 09.04

Minor UI changes