UI fixes
Add basic API