Cleaned up layout (not yet tested)
Rain button tweaks