Design changes

Squashed commit of the following:

commit a2b0ed332145bf98774a3a9629186f944b858987
Author: bigEE Design Team <bigee.dev@wupperinst.org>
Date:   Thu Mar 14 14:53:52 2013 +0400

    Design changes

commit b9ba2ff48c07433a548877bcead1c22b3846673d
Author: bigEE Design Team <bigee.dev@wupperinst.org>
Date:   Thu Mar 14 14:53:38 2013 +0400

    Design changes