added toggle and improved positioning