Added apply button + various improvements.