Removed css
Close confirmation dialog removed
Code optimisation