Use invisible instead of separate intent
Clean up