Removed the stupid border
Updating todo