resolve conflict, adjust css file to make category float left