Modified basic ui as requested by client