Improve desing + remove grid (for test)