Some clean ups/refactoring

One thing that stands out is the expand buttons on windows look better