Updated looks. Needs polish