major aesthetic rework