made changes to colorblock page
fixed merge errors with league page