Revamped forms