trying to fix some minor desgin changes after all the fixes