added more composoble element fns
cleaned up buttons
added icon ns + icons