Make it prettier and add buttons