SFD-7

Updating the some of the UI components.