Style switching bugfixes, some CSS styling