Fixed Several Layout Issues