More edits of UI based on first mock-up.