Design refresh. Found some minors bugs