[#84108742] welcome page refactored