Added fancy button and other cosmetic changes