Added More UI components, added correct names

Added UI components, correct UI component names, added events for
controls