Quotes handler completed

UI fixes complete