Fixed some presentation-level stuff