fixed dependency issues
fixed ui issues