Restructure article page for more semantically correct order