Visual changes, and some fixes