New build

Settings is starting to look pretty decent