Fix the post button issue and improve it a little