STEP3: minor UI changes, ready to deploy