Removed hard-coding. This is a release candidate, modulo a bit of styling