tons of improvements, new layout