UI improvments

Add logic to buttons