Added menu icon, and fixed som db issues