Fix switch modes and add assets