Continued work on UI. Minor bug fixes.