fixed layot ossues