button should be always visible
some fixes - wrong indention etc