added alignment buttons
added unlink button
Merge branch 'iss10'