Improve render and menu