fixes on setup view