Beautification, lcd testing - not finished