UI and phone fixes

UI and phone fixes