Fixes + implementing "new" screen