Finally soemwhat happy with style changes