Simplified to use ngShow