UI code cleaned up, style changes, etc.