refactors
adds solid blocks
reorganizes display