Cleaned up version of MateIT Frontend