More button fixes and changed permalinks for some custom post types.