Testing flicker fix. Slight layout tweak