bugfix and caching
disable margins for better display