Added UI support
Cleaned unused files