Added handler for draw and updated layout with competition