updated layout of raintg and cleaned up