fixed the over flow and alignment issues