Merged Jorge changes, minor CSS no-no fixed