Columns are behaving strangely, hope this is an acceptable fix