Fixed issues with close buttons

Close buttons no longer overlap area needed to open the settings and
users panels