bootstrap integration and ui improvement