Updated a lot of things including design