More work on finance console mockup