Base Theme Update 2

Several small bug fixes