Forms added and UI fixes