Added gold rim, other minor cleanup