units finished and CSS cleaned up