Implement working schedule and cosmetic changes, fixes #239 Closes #239 and #237 See merge request !20