Start reworking client UI