Removed unavailable positions, refined some pages

Some general cleanup