Improving local layout + work on some new Core features in future