Minor bugs fixed.
Appbar replaced, null text detection.