! that should be a better way to keep those submits/links common

Signed-off-by: Spuds <spuds@spudsdesign.com>
! remove some unnecessary class calls

Signed-off-by: Spuds <spuds@spudsdesign.com>