Better annotation functionality and graphics