[#57] Remove unnecessary css classes; Change colors to variables according to c-r [55fe315]
[#58] Add popup close action to buttons