added margin and fixed padding on right so that it is usable on iPhones
Merged in changes from Carin Meier