Fix Layout and Bug by KAMRAN KHAN