Styling issues #54 and #43