Added sample data and fixed a few UI things