Last bit of reverting UI changes....I think...