Fixed issues with Edit Vew controller