Clean-up
Add icons
Service layer implementation
Transactional support added