fixed base a little, added some parts of apply button