UI Changes

Added Tags to the