Improved button funcionalities