Jcarrion/ui restyling