BK-1063 and BK-1064

BK-1064 Links from FrontPage should point to correct locations
BK-1063 Dashboard needs to point to different "locations"