Improved Compose button and number entry screen
merged