fixed ui. LOTs of work to do here