more mobile friendly and added state colors