Updated UI for tablet and smartphones, bug fixing