Finally got something looking presentable