80% UI DONE