done for today -> changed colors, refactored code, further frontend work