Design fixed
Merge, hope nothing went wrong :D