CSS revision + some bugs corrected