made external page generic and fixed a few issues with the settings refactor
minor ui update
merged master, resolved conflicts