Done with logic, need to fix appearance