Refactor module a bit more

Contents drawing seperated from draw function, so this can easily be
overridden.