Design fix and stuff