More enhancements + toilet widget