Changes to Do Not Disturb mode

Make it so that the mode can be turned off at any point of time. Like turn off after 1 hour , 2 hours , 5 hours and also make it that you can choose if you want - 
1. Only calls no messages.
2. No messages only calls.
3. No for both calls and messages.