Added a few things, added main page