Design UI - fix bugs found during implementation