Basic layout of ui complete. move some files around.