Design updet + fixes