Added calculator form + layout