Added kicker layout and several bug fixed.