Fixes for locked timer & correction to text and alignment and size on settings