Added tips and tricks functionality
Added tips + tricks functionality.
Merged changes.