Continued work on UI controls