fix layout
fix layout
new boostrap and alert system