UI improvements + BroadcastReiceiver