Added modal form, added username display