cosmetic changes and some button functionality