Adding some features, fixing layout, testing on devices.