Bit more work on ui