CORE-5759: Corrected layout issue
CORE-5759: Code cleanup