More some styles around to make it a little less messy -- Fix #9