Functionality fixes and beginning of OOCSS