Changed formatting for more elements