Several timing bug fixes, styling etc. Apply button works again