Changed layout to fit both tablet and phone