Cleaned up code; fixed toggleLayer method; added default button icon