improved layout from Android app