bugfixes for initial page need to pretty it up though