More ui work and prebuilt shapes