base: code cleanup

Change-Id: I06721f684cc44425264c86b1e9d5952b2c6572fe
base: fix clock style when hidden

Change-Id: I93f77308b3d4abb4d760284b1bc6b05b544acc52