Improved design page + cleaned up TODO