Branch: development_settings
Button design change
issue fixed datetime