More work on UI re-design.