Layout Issues Fixed