first commit
working complete UI