Added apply button
minor tings