Reverting some of the custom ordering for gotham view