Few more tweaks, made the buttons a little nicer