fixed text and alignment related issues