Add some improuvments on pages and fix bug on connections