awake time form hides global nav button
fixed merge conflicts