Issue #225 Refactor gaia view